Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sun, 31 Oct 2010 14:41:32 +0000 (10:41 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 31 Oct 2010 14:41:32 +0000 (10:41 -0400)
commit797acf965b0e4393ec499395230ca35046ccc312
treecd3fd18cd4db6c4fded51e99d6b8b06d6220075b
parenta4e6f729a3535d4b1199b70722553ee6b7e7e48b
parentdf44e0c75bc446e2dd6c729e1aecb6c598c4013a
Merge changes from emacs-23 branch